Make expanders prelight

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f9df1f519108fb9280114cb1527a61f716ec7185..02dffb00b31c4ce44d2d2ca59c0977ab2bea82a2 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -3436,6 +3436,10 @@ gtk_css_provider_get_default (void)
         "  color: @selected_fg_color;\n"
         "}\n"
         "\n"
+        ".expander:prelight {\n"
+        "  color: @selected_fg_color\n"
+        "}\n"
+        "\n"
         "*:insensitive {\n"
         "  background-color: shade (@bg_color, 0.9);\n"
         "  color: shade (@bg_color, 0.7);\n"

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 1da8821a4f350e0e0cc4c41f0b8eb1b8f37b4e65..6fddf0c235ec7f7db991f38cb6863c7f98f1e3b2 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3215,6 +3215,8 @@ gtk_default_draw_expander (GtkStyle        *style,
   if (detail)
     transform_detail_string (detail, context);
 
+  gtk_style_context_add_class (context, "expander");
+
   switch (state_type)
     {
     case GTK_STATE_PRELIGHT:

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index da50cd583f509f095bf111657c51872a2d8b54a1..f7961bc1a4be112bc0524ebb10d96440b5943a84 100644 (file)
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1748,7 +1748,7 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
                                     gdouble           height)
 {
   GtkStateFlags flags;
-  GdkRGBA *bg_color, *fg_color;
+  GdkRGBA *outline_color, *fg_color;
   double vertical_overshoot;
   int diameter;
   double radius;
@@ -1764,7 +1764,9 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
 
   gtk_theming_engine_get (engine, flags,
                           "color", &fg_color,
-                          "background-color", &bg_color,
+                          NULL);
+  gtk_theming_engine_get (engine, 0,
+                          "color", &outline_color,
                           NULL);
 
   line_width = 1;
@@ -1834,13 +1836,13 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
 
   cairo_fill_preserve (cr);
 
-  gdk_cairo_set_source_rgba (cr, fg_color);
+  gdk_cairo_set_source_rgba (cr, outline_color);
   cairo_stroke (cr);
 
   cairo_restore (cr);
 
   gdk_rgba_free (fg_color);
-  gdk_rgba_free (bg_color);
+  gdk_rgba_free (outline_color);
 }
 
 static void